Skip to content

Comments

skyblue water color, in Math.h, common for game and editor#120

Merged
mgerhardy merged 2 commits intomgerhardy:masterfrom
cryham:water-color
Mar 7, 2025
Merged

skyblue water color, in Math.h, common for game and editor#120
mgerhardy merged 2 commits intomgerhardy:masterfrom
cryham:water-color

Conversation

@cryham
Copy link
Contributor

@cryham cryham commented Mar 7, 2025

Changed water color to darker and skyblue, moved to Math.h and did same for editor.

@mgerhardy
Copy link
Owner

mgerhardy commented Mar 7, 2025

getting a lot of compiler warnings here.

/home/mgerhardy/dev/oss/caveexpress/src/modules/common/IFrontend.h: In member function ‘virtual bool IFrontend::renderWaterPlane(int, int, int, int, const float (&)[4], const float (&)[4])’:
/home/mgerhardy/dev/oss/caveexpress/src/modules/common/IFrontend.h:107:105: warning: declaration of ‘waterLineColor’ shadows a global declaration [-Wshadow]
  107 |         virtual bool renderWaterPlane (int x, int y, int w, int h, const Color& fillColor, const Color& waterLineColor) {
      |                                                                                            ~~~~~~~~~~~~~^~~~~~~~~~~~~~
In file included from /home/mgerhardy/dev/oss/caveexpress/src/modules/common/IFrontend.h:6:
/home/mgerhardy/dev/oss/caveexpress/src/modules/common/Math.h:105:20: note: shadowed declaration is here
  105 | static const Color waterLineColor =

@mgerhardy
Copy link
Owner

mgerhardy commented Mar 7, 2025

new:
introducing-01-package-2025-03-07-18-50-11

versus old:
introducing-01-package-2025-03-07-18-51-29

maybe we should make the color of the water depend on the theme of the map

@cryham
Copy link
Contributor Author

cryham commented Mar 7, 2025 •
edited
Loading

maybe we should make the color of the water depend on the theme of the map

Good idea. I think for later.
I'll fix the warning.

@cryham
Copy link
Contributor Author

cryham commented Mar 7, 2025

This should fix the warning

@mgerhardy mgerhardy merged commit 6ece250 into mgerhardy:master Mar 7, 2025
2 of 4 checks passed
@cryham cryham deleted the water-color branch March 7, 2025 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cryham @mgerhardy